Fix shout bug. Cleaned up some code.