Many fixes + new settings feature