Fixed some bugs that I not realized on previous commits.