added cosmetic/compatibility changes