Fix #113, Fix #71, Fix issue with settings not being applied on startup.