Add a few things here and there

Feel free to merge just some of them.