some upadtes...