fixes and changes ;