fix & cleanup
fixes
fix