more open changes and clean up