more hints and fixes
wip