final fixes #77