Fixed some errors, insert witty commit message here..