Changed some hard-coded constants and the command-line options related.