Minor changes and bug fixes
File sending ready.