fixed related fields
minor fixes: names and labels