Some more fixes + added more settings