More misc. changes, especially in regards to organization.