Mostly final changes