minor changes and testing