minor updates & fixes