Fixing intderdependency issues.
Reverting barf, adding other things.
fixing barf indescrepencies
fixed selfmsg to msg
fixing whitespace
Merge pull request #49 from cptmashek/master

Merged updates, reverted barf usage.