A little fix ;)
Some bugs fixes with some new features.