more fixes also closes #384