Correct implementation of 'unparse()', some class changes (mostly statements)