Comstock renovation ‘substantially’ done