some bug fixes I getted scared wen seen the adre var error