fixed bugs, added description