fixes #42
fixes #38
Minor updates