Cleaned up output and add -i switch
Updated usage information