more bugs fixed