lots of important fixes for menda square