Bug fixes, stability and code base update