updated booleans and globals