minor changes & fixes