misc changes and testing