fix elevator bug / laser issues
Merge branch 'devel-chris'