simplify wall drawing & misc