fixed bugs, added modules