removed unnecessary functions from module (bloat)
added message handling, serving Feature 13