A few more things

Added to the TODO