Update, disable deprecated features in some places, add comments, etc...