Fix data classes; fix BCodeEdit return handling