fix indentation, fix force option