important make-up, refactor and corections