fixes from lap82