lots of small changes to beta version