another big bag of changes
magic, have no clue but it works