Added various things - have a look