fixes, re-org