Bunch of fixes, updated README