fix activity bugs