Fix stability and some features.
Clean code.