Updates to various files

various updates to several files so that they work better together.