Updated usage example and fixed minor stuff