added new scene

including some additions to scripts
solving some merging problems