Chunky update (20w17a, bug fixes, improvements)