Dev ms

Most issues now fixed.