fixed bugs, updated, improved