added function objects; fixed a bug in which comp-show referenced a no-longer-existing function