Many functional changes to bring inline with what MLN wants.