better block handling, more conversion