client cleaned up
merged
removed prints, tested with large files