Minor changes, trying to get structure setup
Minor startup changes