Added plugins and tidied up