small corrections and better looks