Fixed Optionals

Welp it was about time.