added timer set toast, removed intent filter function

refactored slightly
refactored slightly
fixed merge conflict