Assignment 3 with Fixes

@toastynerd Here are the fixes from pull #134. Thanks!