End of Summer of Code Commit

Committing minor changes to wrap up the Google Summer of Code Project.