bug fixes to final project