Fixed sign logic issues and added some blockface logic