Updated Makefile.PL
Cleaned up message dispatch
Little cleanups