better updating and added settings