fixing and getting stuff to be done in a better way :P