-minor changes, should have been in the last commit