fixed a few other things