fixed a couple bugs...still not working