still fixing problems, fixed a few obvious ones