fixed feature classification, and got location working