added todos
fixed multiple taps for admin