Ridiculous bugs fixed