major update
scratch space & push to package
tidy up