Improve RST_addons, fix bugs