Changes to Segment error checking

Still have to add enum validator