Solved some bugs and updated README