made lots of corrections and additions for release