Chess Annotation Software I frequently use chess.com to self-analyze and annotate my games. Although it has a useful feature to save my annotated game as a url (which I then save as a bookmark), I'd rather switch to local software so that I may organize and backup my collection. 

I have tried a couple of engine-oriented programs like Shredder and Stockfish for mac, but they don't really fit my needs. 

I generally just need software where I can import a pgn (or setup a position), make moves on both sides of the board, add annotations, and add move variations. And that's pretty much it. It would also be nice to be able to categorize my games for easier access.

I don't need a chess engine or any computer-assisted analysis, although I understand that those would probably be bundled with most chess software. 

Can anyone provide any suggestions that might fit all or some of this criteria? Any help would be appreciated!
I agree with @InertialIgnorance Chessbase is very useful and good. I have also used chess database software which have the advantage of being free:


Scid ("Shane's Chess Information Database") is a free and open source UNIX, Windows, Linux, and Mac application for viewing and maintaining huge databases of chess games
Scidb,  is a free chess database application for Linux/Unix and Windows. Scidb is inspired by Scid but it is a completely new development.