Fixed all settings now (0.1.1)