bugfixes
finished hw2