General updates and code cleanup (using chaining more) and a new block for future use.