refs #93, fixes due to big merge