Pull request of doom

Everything I do will explained in each commit title.