added multiple run functionality + more tests + beautification