Minor cool improvements

Still need to finish delete