Fixed some small stuff; refactored activity calls