fix stuffs

I'm abusing pull requests, don't merge this yet.