lab1: fixes for resubmission