Fixed all pull submissions and updated to spec with me4oslav's approval.