Update README + more fixes