little fixes and stage1 tested