continuing to fix type checking and annotation bugs