final improvements
integration for RWTH Cluster