housekeeping - shifting internals around, adding pretty lambda functions