Improved some stuff :D.