Some more touch ups