small fixes, works as expected