lot's of small fixes