Final touch

Default MOTA/MOTP = commented.