Switch plugins to use new tool api
Updates to get all tools tested and working
Make other suggested style changes