closes #2009
closes #2007
closes #2005