Fixes to alot of bad code...