Mostly a compatibility update, with some general beautification. The following important changes have been made: