Adding a few misc pieces