cleanup and shell script updates