added a bunch and made it possible to use just roach2