various corrections and removal of anonymous types