updates

loads of updates and fixes/changes