comments for later (master)
tweaks (master)