Update dev target to 6.1 and some code comments