Fixed bug where original features were appended

May have also fixed max features bug.. will check with Minh.