Minor corrections and clenaup