Added note and fixed how basedir is handled