a few bugs fixed
a few more bugs fixed