Commit 2 Description: Fixed minor bugs.