some bugs, better processing