minor changes and a few adds