lots of small fixes + links