minor changes. much more to come for stability, etc.