thomas
fixed up stuff