features and comments added