Fix some things

still hope it works...