fixes made per comments