More updates, cleanup of scripts and directories