load of bug fixes :)