final touchups and fixes