some fixes so it actually works.. kinda