Some fixes

Added .servicemsg item
removed/fixed crappy stuff