Some updating to make things work smoother and nicer =)