Small fixes and Invisibility Staff