Changing Edit Captions and Edit Album to restrict user access

Hi,

I'm struggling to figure out how to get Gallery2 to work the way I had it in Gallery1, most of which is based around permission changes. So far I've used the modifications in http://gallery.menalto.com/node/70844 to remove core.all permissions for new albums/items that are created by non-admin users. However, this has resulted in Edit Captions no longer working - I even tried modifying the code in the above link to add all the core permissions except core.all and Edit Captions still results in a security error. If I give the user core.all to the album them Edit Captions works fine.

I'm also wanting to remove access to the Albums and Themes editing in Edit Album - ideally I only want users to change the title, summary, keywords, and description fields for an album, but I haven't yet figured out how to automatically name the sub-album either.

Can anyone help with this? Even just pointing me to other similar code changes that have been posted would be helpful as I haven't been able to find anything other than the link above.