-m added more robust arg parsing