First cleanup and readme

Need to better test the changes