- final fixes