pull changes, other housekeeping, proj update
updated to components less straight forward so sep. commit