Bug fixes + added more functionalities