Bunch of changes

Just look ... too many changes to list.