big fixes, fixing screen 2
merge from trunk