clean up names
added some file sinks for debugging