minors, comments moved to separate file