fixed lots of things in regular and irregular