Cleanup, final fixes

Cleaned up contextual code which must be at one level above and fixed
few segments being fast scrolled backwards