Doc and file updates... mostly clean-up
Making this work on my machine. Need to generalize it later