Fix clang warning and improve error checking logic
Fix help string typo
Updates for compatibility with the clang compiler included with OS-X Mavericks.