Updated a few bits and pieces