Lots of changes made to get fresh install running smoothly