More updates for Lab 2 function.

I keep finding things to tweak in this thing; so annoying...