todo comments
minor cleanups and constexpr for Optional