small changes
still working on the right params but don't want to hardcode
fixed that mother fucker