Minor updates

Some minor updates and cosmetic changes to various files.