several updates & fixes