Small fixes in readme and minor restrucuring