some improvements (mainly for redhat based systems