bunch of small fixes :)