many improvements; getting ready for working package