Some variables problems were fixed.