Fixed small support sort of. Did other small fixes.