some fixes n shit