various fixes
26 now works
comments