hLinted and fixed mostly fully updated