module.onframe added.
Removed end of line whitespace.
Merge branch 'master'
Now handling filtered data.
Moved focus handling to the individual handlers.