Fixed Matrix bug, Add UserProfile, Performance improvements