more cleanup and fleshing