More touch ups. Comments. Edge cases