Added error handling, help text, etc.