Some cleanup, bugfixes and awesomeness =)