Stabilization and bug fixes