fixing bits and pieces