Added tons of new functionalities
Few fixes