Updated readme and fixed some small issues