You might want to have a look at CompuPic Pro, I've been using it for a few years and they just keep adding great features. Covers everything you listed.
_________________________
ricin
MkII/080000565
MkIIa/010101253
ricin.io