surprised this worked on my machine
some fixes and other stuff