Added block sets and fixed visability