* more (better) fixes