Working on Arch Linux now, did a bit of refactoring too
Deleted printf's, cleaned up a bit.