fixed a few boogs and reorged