merging support html and Dan's features file path fixes