Finished with comments in UserActivity.java and fixed some tiny bugs