Changed log to Liferay one.
More updates.
More tidying.