ProGuard settings and minor changes.