Weather added & fixed