- fixed bugs & added testapp