Improved some stuff