Settings extended/edited | Many other things fixed