Updates Spec Files, Fixes Bugs