Fixed many issues the original two versions had, but has plenty of it's own.