fixin little bits and pieces