Added some missing items and fixed errors