Add more error checks, reformat options check, cosmetics