Updated annoyences, fixed 3