fixes after running it on my laptop, more to come