fixed many plotting issues