Added more Blocks, updated code

Title says all