Added and Modified some features