some more scripts, cleanup and more