more fixes, needs fj