fixed some final (for now) issues with asst-10 for cs758