- fixed some bugs. 
- Compiling wihout erros