minor fixes to already functioning, submitted on-time code