final boss

fix bugs