Loads of changes & bug fixes