minor changes and test