bugfixes and exposing more control over filenames and paths