Added a few blocks, package cleanup