Fixed the positions of notify() to prevent the exception John was getting.

[marcospedreiro]

notify()s must be called from inside the synchronized block, while the thread still has control over the object it wants to notify on.