A lot of gen 1 fixes and additions