Improved some stuff.