Many Bug Fixes.