Some minor changes and testing