Re-enabled some plugins that got disabled for version 0.2. Also some minor cleaning up.