finished up optimization, bug fix for multiple runs