FIX
# bugs
# settings adjusted