final fixes, hope so