prefinal cleanup
small debug push