all bugfixes

Signed-off-by: Mads Jensen <mje.mads@gmail.com>