Refactor some code, add properties speed and multi