Fixed Configuration Loading, and added new blocks to default