more changes, added TODO, fix toggle