Fixed settings bugs & more checks