topic 3 fixes, and topic 4 almost complete v1