Fixed Bugs and Added Features