Updated specs and cleaned up files for new weather functionality