Fixes #42, Fixes #45, does a try on #46