Implemented better settings. Other small changes.