more changes and clean up