Small tweaks to Option + added Result type