fix bugs, now workful