Extra log output + polish rough edges