I have just applied patches #119 and #121. I did some testing and they look ok. Could someone test and confirm, Steve :)
About the 404 issue above: If someone wants to work on it I could provide info of what needs to be done. Otherwise, I'll do it over the weekend.