TJ: small fixes, organize imports etc.