fixes
progress...
htab, fixes