controller additions+fixes