more settings stuff + cleanup