Insert and delete work, as well as other minor enhancements/bug fixes