Commit 1 Description: Fixed minor bugs.