More samples and some fixes to feature set