fixing bits and pieces that need fixing.