Fixes and organization