Refactored loads of stuff, looks alittle better now..