file naming, etc fixed. more to do.