minor fixes and use a .spec file