Added more features and comments