fixed bugs, improved features