type checking a little better now.