fixed a few weird things