Various small wins, fixed an incredibly dumb bug