Update to features

Updates /features so they are all passing, once combined with Elz's pull request. This includes a couple of bug fixes that were needed to get the features to pass