Added a not on minor improvements and bug fixes