Cleaned up SectionedService + fixes