Changed comment-style to doc-style
Minor data type fixes
Optimized filepaths - again
Merge remote-tracking branch 'origin/data' into network