Fixed minor bugs =)