Some updates & fixes