Fixed registration queue issue
Misc cleanup
Case options to an array