Minor updates, cleaning things up etc.