Sorted out ideas a bit more, added some new ones.