redo formatting and finish up weather functions