Bugs fixes + improved + spec files added