cleanup, moar work on misc things