added plugins and fixed some idiomatic mistakes