Added/fixed a billion things :D