Added helpful methods and fixed Bugs