Some corrections and port