various changes (not tested)