Some broken thing pushed, after rebase -i

Broken commit 2

Broken commit 3

Repaired broken things