Various level 1 fixes and changes