General Fixes

All the fixes since my last commit up to IsmAvatar's standards.