fixes, additions, and new fragments from newer master file