update comments
update comments
Small changes and update to tests