debug info, tests instead of demo, fixed bugs