refactored updates & bug fixes