Expand feature list, fix snippet