#104 updated, fixed minor bugs. working with some bugs.