comments, file location tweak