Fixed several bugs after field test, activitythree is still broken