small changes in various places - will submit this morning