New 016 and 020

and some small updates