Fixed bug with empty "-p" argument. Fixed bug with dry-run without merge. Change output to "Atom #" and occupancy for fixed sites.