fix errors + add missing measures