fixed some things

Good?