Improved logging, fixed enligsh