Minor changes in stuff... more work to come