Enhanced integrity checks

Also changed some pin mappings for testing