Fixed a heap of misunderstandings