General plot transition fixes and cosmetics