more bugs fixed
again?