#45 & some more fixes