Fixing up ideas, adding a few