Switched to new chips and made a few fixes