small fixes n stuff