Cleaned up qparse
fixed annyang come bug