Bug fixing & moving old stuff