2013-03-01: EPL added, many minor improvements