[v.1.2.3] Ready to release

small code improvements