finishing update for Optional stuff in vertex classes