fixed up a few little bugs, all working