fixoed couple of thigs, alerted some parts of 2d eq