fixed a few things here and there