Two new functions + output corrected
Added support for options with input
Oi changes m8