fixed glaring issues, now to clean up pipeline