Presenter and some minor changes