a couple of small fixes, still some issues, but getting better :)