some personal fixes