minor corrections, new issues :P