Bug fixing and feature adding