this file TODO should be killed, but update it a bit anyway (plus cosmetics in comments)