handle last online stuff properly & update toxic version
fix