Tabbing fixes and more cloak work