project 3 cleanup/bugfixes/etc