Minor updates and some brain storming