final fixes and clean up
really final stuff