cleaned up the stubs a bit

still following tuts loosely.