fixes and changes...