Added extra features for School project & fixed found issues in current functionality