Fix bugs and more features