* fixing a bug in restricted option parsing, and trying to optimize memory performance slightly