more cleanup and issues