Improved activity and fixes