cleaned up the arg handling to actually work