Random fixes, cleaned some code up, a bit more work to do
Sorting works; improvements to finalize; general cleanup
Merge pull request #6 from ksuarz/testing

Finishing touches