adding jae's fix and also getting rid of my warnings