some more improvments and working spec file again after the changes