more stuff (TODO: write better commit messages)