refactoring, cleanup, new items, more correct application of effects, additional templating functionality