more blocks plus code improvements