THese were just some quick fixes vartan could do himself. The rest will be done later.