Modified html messages.
Fixed couple a nasty bugs, that's all for a while (I hope)