debugged, autmated and added features to feature map