more fixes, notes