add features & fix bugs