added rest of features, renamed file