1.1 i4157

misc corrections (closes #4159) ( closes #4157) (closes #1961) (closes #1962)