a bucket load of stuff

updates, fixes and additions