Simplify feature vector and make it easy to not multi-pass. Also fixed accidental double reading.