some bugs fixed but not all