Touch ups/minor stuff that I forgot in the previous commit...

Signed-off-by: Michael Zemsky <zmike808@gmail.com>