Polished setup and teardown. Motorola bug fixes.