improved, minor fixes