fixes and organization