bug fixes and wireless overlay experiment