some more bugs fixed in stair code