Fixes and new problems added