Tested some different things, bugfixes, etc...