Fixed (?)
Fixed the mess, seems to be working locally
Please report back any issues you might find.