Fixed bugs all around. Christmas is coming!