added stair and cleaned up