- fixed some small bugs
- this branch will no more be used