Bugs Fixed

Now working with no live database