Updated "clean" rule
Minor changes
Real file streaming support finished, refactoring, minor changes