Add a few bits and pieces