Added destroy method + some internal fixes