Commented and detailed more features