final fixes
quick fix