Cleanup and add a few more items