Updates to core functionality all over the place