fixes per zlojkashtan suggestions