fixed a few things
fixed a few things