Updated to beta 1.0

Loooots of bugfixing, making the behavior intuitive, etc.