Add support for relative paths in add/remove

Also, some cosmetic changes and one typo fixed.

Let me know if you have any objections.