fixed a few major/minor bugs