Solved Bugs and Added new features