more cleanup, little things