couple small but key additions
reverted some changes