todo next
some leftover updates and new ones