Nothing really life-changing on the code. Simple bugs
and some necessary stuff added.