Some polish + fixed potential bug