more updates to 1.6.1 not finished yet