changed and improved some things