Tried my best. It's not perfect by now, but we're getting closer. Thanks for the great teamwork!
Fixed my own bugs