minor changes, should be ready to submit