Great amount of small fixes