added in vic's suggestions as todos