infrastructure review and fixes