Update readme and some internal comments