various small changes, ticktets to issues etc.