Finished runner script. Minor bug fixes