initial commit after fork; some minor changes