finished up regular mods

going to bed now. Phew...