Improved some things...