more clean up
fixed ip, cleant up more