worked on some bugs