cleaning bugs, ready to merge