Fixes some things

I mighta lost a few bugfixes due to some git conflicts and the fact that
the asses that make git seem to think everything should be in command
line for some unfathomable reason.