Plugin completion. Lots of small fixes. This is mostly done now.