Fixed everything, consider this stable