I have fixed the mistakes (I believe), thank you for the feedback.

As for the "kapitan from scratch", we're working towards makes the init process easier, and until then it would be too tedious.