Bug fix and wall color