made some fixes, not sure why I initially had {} in