Revisions and fixes