fixes according to comments
update to fit with the comments