Add extra option handling and fix my silly math