Cleaned up advanced options and advanced option retrieval, making special note of case of zero input