fixed activity controller and more