adding update_url and major fixes