Fixed Bugs and Updated Docs