even more bugs fixed