various changes addressed