minor code improvements
plugin links modifications