Updates and fixes

- messages work again (removed whitespace characters before checking for
IsNullOrEmpty)
- commented out helper lines in instant messages file