Fix bugs and update dist/