Some prefab refactoring of obstacles, some cleanup