Allow autobeaming, improved option handling