Some fix tries... & minor fixes.