improved some things