Fixed minor bugs that was commented on the github.