Fixed better plots