misc options cleanup
Basic update functionality