Add missing stuff

Format messages nicely
Somewhat optimize existing code
Plugin should be ready for use now