Bug fixing & Capes