fixed minor bugs, redefined design, release 1.1