fixes, some changes...