Added checks for length of input and output features; added a couple new types of features
Fixed merge conflicts