fixed random bugs and redid dictionary