bug fixes and added notice partial'