more bugs fixed
merged