New settings and also some small fixes