little bits and pieces being fixed