Cleaned up and added wind info

Got rid of clutter and added wind info