latest updates from local. bug fixes and small improvements.