Scope, fix minor bugs (now runs)