Add comments and fix feature ratings