update to current working version

lots of stuff!