Various changed from Jonathan

Nice catch