#60 final fixes