bug fixes and general goodness

Signed-off-by: Frank Llamo <fllamo@rosettastone.com>