improvements, bug fixes and updates