Removed Bugs + Added Features