fix return value for M, p, q fields
update gui files