merge updates from karls major branch