more cleanup
updating todo
adding configuration for poll interval