Cleaned up collation, added -n ### flag support