Bug fixes.

Signed-off-by: Arica Liu <aricaliu@wpi.edu>
Merge remote-tracking branch 'origin/team1-dev' into team1-dev