lots of new stuff see README