Corrected:
	Unitialized variables causes erratic behavior #8
Removed obsolete files
Context is now fully tagged private.