Thanks for the suggestion. I don't like Kindle all that much (I convert Kindle files ASAP) so I think I will invest in a copy of Mantano for now.
I will keep tabs on Marvin though, and switch back as soon as I can trust the Highlights/Notes to stay where I put them.
