Fixing stuff - yes, descriptive commit messages ftw