fixes #94
various fixes