Merge pull request #39 from rcconvict/master

General cleanup and bug fixes
Added "Themed by Frikish" on the footer
Cleaned up bad variable names.