I second the suggestion to just use Google. It can be hard to find, but
http://www.google.com/contacts allows you to easily manage, group, and edit contacts. Google Calendar is constantly being improved, and an advantage of using it is that you can edit it from any computer, and it'll be updated to your phone.