Fixed some things

Fixed some things