Improved even more stuff :D.