All them fixes

Here's hoping I can actually get stuff to work
Small changes