Upload 6

sundry changes