revision updates, fix some warnings