fixed some things
updated some fixes/warnings