more bugs fixed...