Final merge. Stuff is fixed. :)