Add wrapped block position, fix some errors