package cleanup
trial by fire fixes