Small changes and added todos.
Button event handler are now run asynchronously.