Small adjustments. Really needs a full rewrite

Signed-off-by: Jack Huey kitskub@gmail.com