fixed a bunch of things here.