Add _getBlock method. MInor fixes etc