Bug fixes and new look and feel