bug fixed
refactored

mainly around propeties
updated data