fix vars
fix vars 2
fix hooks