Running fixed. Added new bugs. It seems like it works!