Updates, revisions and a bit cleaner