misc updates, working version ready