Submission and Some Fixes

Here's my submission as well as some fixes for the repo.