some fixes and changes...