Various changes. commiting as backup.