lots o stuff

basically a big lift towards a new version