fixes for items krista requested