Added personal e-thug version, small fixes