Fixes + more tools