micellaneous small changes/fixes