Comments + file base path + completion fix