Some minor changes and clean up, testing