Small Changes

Ready for testing.