fixed erroneous hard-coded winids in calc