Fix bugs and missing items