Fixing some usemin blocks and general cleanup.