Added some constants to q
Minor cleanup in param