Fixed everything up that was said to be wrong, expect release soon