Some small updates. / bugifxes.