15387 fixed by gingers comments
finished going through gingers comments