updates & small fixes