bug fixes, some address changes, etc