Added a few things, see comments for various ideas