Multi-file sending

Added multi-file sending + small clean up.