Fixed some things,

now I need to fix block ID matching