Fixes some bugs, adds annoyance functionality.