changes by leejaew

a few changes, with integer vars, has been made :)