Major update: Bug fixes and Organisation

read: messages\1.2.1.txt for more.