* Fixed some variables