Added info output, minor fixes