added in some fixes, broke the laser though.