Plot little speedup and proportion map fix