INDUS - bunch of code cleanup, use the better thumbnail code