fixed a bug, added minor stuff
updated 1.2 with bugfix