more topology and minor edits here and there