Resolved definition confliction and fixed frmttng

(too few name characters damnit)