add model and adresses enum
small fix in comments