some fixes n stuff