just fixed a few bugs