many more fixes and updates to not alter core code...