Some code cleanup and commenting
Resolved conflicts, finishing merge
Fixing feature extraction