Fixed some stuff... Getting lazier with these commit messages O.o