some bugs are fixed now