some bugs fixed
some bugs fixed (again)
some fixes