some shuffling around + fixes