Updated readme and various